handle discovery renaming when listing resource in tctl text format#29887
Merged
GavinFrazar merged 9 commits intomasterfrom Aug 4, 2023
Merged
handle discovery renaming when listing resource in tctl text format#29887GavinFrazar merged 9 commits intomasterfrom
tctl text format#29887GavinFrazar merged 9 commits intomasterfrom
Conversation
* display the discovered name from label in non-verbose text format for db, db_server, kube_cluster, kube_server resources.
smallinsky
approved these changes
Aug 3, 2023
|
|
||
| // SortRowsBy sorts the table rows with the given column indices as the sorting | ||
| // key, optionally performing a stable sort. | ||
| func (t *Table) SortRowsBy(colIdxKey []int, stable bool) { |
Contributor
There was a problem hiding this comment.
can we validate the the ColIdx is not greater than len(t.columns) ?
ravicious
approved these changes
Aug 3, 2023
public-teleport-github-review-bot
Bot
removed the request for review
from capnspacehook
Member
|
Is there an easy way to test those discoverable resources with a local cluster? I suspect there's no easy way and it'd be best to set up a cluster in our Cloud + some dbs on AWS. I only verified that regular resources still have correct names when using those tctl commands. |
Contributor
Author
yeah this is the best way. we have databases already in several regions in our dev account, you just need to configure a discovery service in your local cluster. You can make an IAM role with the required permissions in our dev account and have the discovery service assume that role with |
|
@GavinFrazar See the table below for backport results.
|
GavinFrazar
added a commit
that referenced
this pull request
Sep 16, 2023
…format backports #29887 to branch/v13. * display discovered resource name in tctl output * display the discovered name from label in non-verbose text format for db, db_server, kube_cluster, kube_server resources. * support labels, predicate, search in tctl kube ls * avoid type conversion in tctl db ls * sort kube and db objects in tctl text tables * test kube/database collection text format output * check column indices are in range
GavinFrazar
added a commit
that referenced
this pull request
Sep 18, 2023
…format backports #29887 to branch/v13. * display discovered resource name in tctl output * display the discovered name from label in non-verbose text format for db, db_server, kube_cluster, kube_server resources. * support labels, predicate, search in tctl kube ls * avoid type conversion in tctl db ls * sort kube and db objects in tctl text tables * test kube/database collection text format output * check column indices are in range
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Sep 18, 2023
#32083) * [v13] Deflake `TestListKube` backports #30024 to branch/v13. * Deflake `TestListKube` * Plumbing through custom kube config path PR #29993 tried to deflake this test but only fixed it partially during login. This prevents the kubeconfig in `$HOME/.kube/config` to be used everywhere * [v13] handle discovery renaming when listing resource in `tctl` text format backports #29887 to branch/v13. * display discovered resource name in tctl output * display the discovered name from label in non-verbose text format for db, db_server, kube_cluster, kube_server resources. * support labels, predicate, search in tctl kube ls * avoid type conversion in tctl db ls * sort kube and db objects in tctl text tables * test kube/database collection text format output * check column indices are in range --------- Co-authored-by: Tiago Silva <tiago.silva@goteleport.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR updates
tctlto list resources in a text table by their "discovered name" in non-verbose mode.changelog:
tctltext-formatted output in non-verbose mode will display auto-discovered resources with original resource names instead of the more detailed names generated by the v14+ Teleport Discovery service.Since discovery renaming only applies to databases and kube clusters currently, I only updated the output for those kinds of resources.
Updated commands:
tctl get [db | db_server | kube_cluster | kube_server] --format=texttctl db lstctl kube lsWhy
RFD 129 resolves discovery resource name collisions by renaming discovered resources with a suffix that includes additional distinguishing information. However, we decided users will most of the time not want to see long resource names that include that suffix.
Related issue:
Therefore, this PR will display the original resource name in non-verbose mode, and the full name in verbose mode.
Examples: